[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: 77fa67e4

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



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