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

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



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