Merge "Remove duplicate method in KeyguardUpdateMonitor" into tm-qpr-dev am: c40394f1

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



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