Merge "Revert "Keep keyguard visible if we're launching an occluding activity...

Merge "Revert "Keep keyguard visible if we're launching an occluding activity over a going-away keyguard."" into tm-qpr-dev am: 0330bedc am: 81229f82 am: 5fe37d0a

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



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