Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev am: 6eaacb50f2 am: 96a6b4aa02 am: 6ac7eb3669 am: 0e46e9c59e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18918937 Change-Id: I0f328faefad051fbdbd7a69f88da1047078d6897 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: