Merge "Fix keyguard dismiss animation with occludable activities." into...

Merge "Fix keyguard dismiss animation with occludable activities." into tm-qpr-dev am: 43ad687b am: 5b340193

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



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