[automerger skipped] Merge "Fix keyguard dismiss animation with occludable...

[automerger skipped] Merge "Fix keyguard dismiss animation with occludable activities." into tm-d1-dev am: e847f7ed -s ours am: 799cb3f0 -s ours am: 4e4c0119 -s ours

am skip reason: Merged-In Ie80187a5ca9b61b8178bbe977bf252db654d9fa4 with SHA-1 1a3135ee is already in history

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



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