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: 3857e889 am: f316acdc

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



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