[conflict] Merge "Respect always unlocked displays when keyguard is shown."...

[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c am: c255fade am: 0976919c am: 50688091

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



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