[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 am: 190696b9 am: 919e3ef9

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



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