Merge "Don't bring up keyguard when activity can show over lockscreen" into...

Merge "Don't bring up keyguard when activity can show over lockscreen" into tm-dev am: f5a79fb7 am: c849d823

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



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