Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev...

Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50 am: 96a6b4aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918937



Change-Id: I07f653a44483d343397f086e0da603a70dc7ba6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>