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 am: 074828c6 am: 119fccb2 am: 8a82d416

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



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