Merge "Do not unregister keyguardupdatemonitor" into udc-qpr-dev am: 453f0bd883

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

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