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: I9400cfd6ff4be99074828f06ed12f79abfd57be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>