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

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



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