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

Merge "Keep keyguard visible if we're launching an occluding activity over a going-away keyguard." into tm-qpr-dev am: b33fcbb8

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



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