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

Change-Id: Ib8cbd277da8f7331fe6355fb998a5444882bb7fc