[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: f2f4f3c8

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



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