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: I59e431bcba0afb69252a3e7955ed0cde49c6b8c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>