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: 901e1ff3

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



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