[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

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



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