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

Merge "[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c am: c255fade" into udc-d1-dev-plus-aosp am: 8412f1cd am: 35ce5133

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



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