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

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



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