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: 46e8e0f2

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



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