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