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

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

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