Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50f2 am: 3857e88905
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918937 Change-Id: Ibf0b40514df57fc007e672eb7929bb3860b5df21 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: