[automerger skipped] Merge "Fix NullPointException in KeyguardUpdateMonitor"...

[automerger skipped] Merge "Fix NullPointException in KeyguardUpdateMonitor" into udc-qpr-dev am: 558e2ef7 am: 7e4818c9 -s ours

am skip reason: Merged-In Ic23d1834e221f30cf08a240f34819eecd6fb1908 with SHA-1 73b787b3 is already in history

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



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