Merge "Cleans up any stray instances of KeyguardUpdateMonitor that might still...

Merge "Cleans up any stray instances of KeyguardUpdateMonitor that might still have listeners attached to system services." into tm-qpr-dev am: d5d35fb2

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



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