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

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



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