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: 3e3ed56a am: 076801f1

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



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