Merge "FullScreenIntent cannot launch unless Keyguard is showing." into...

Merge "FullScreenIntent cannot launch unless Keyguard is showing." into tm-qpr-dev am: 59582410 am: 0df4e33c

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



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