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

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



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