Merge "Report keyguard changes even with display changes" into udc-dev am:...

Merge "Report keyguard changes even with display changes" into udc-dev am: b0ed44a8 am: 486dedfb

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



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