Merge "Respect always unlocked displays when keyguard is shown." into udc-dev...

Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c am: c255fade

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



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