Merge "Merge "Unregister listeners after running KeyguardUpdateMonitorTest" into rvc-dev am: a949a8954e am: 1d2446b8f6" into rvc-d1-dev-plus-aosp