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

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



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