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

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

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



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