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

Change-Id: I8fbbf10b1beb64cd98ac92763d8bc1add1859fe3