Merge "Merge "Report keyguard changes even with display changes" into udc-dev am: b0ed44a8 am: 486dedfb" into udc-d1-dev-plus-aosp am: 0031fb90

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



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