Merge "Fix keyguard dismiss animation with occludable activities." into tm-d1-dev am: e847f7ed

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



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