Merge "Unregister listeners after running KeyguardUpdateMonitorTest" into rvc-dev am: a949a8954e am: 60e3c62b00

Change-Id: Idfc30f1bbfd05e8f37a57d62fb9eae911068de42