Merge "Unregister listeners after running KeyguardUpdateMonitorTest" into rvc-dev