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

Change-Id: I116605bb32b8f47af728b2bb64b03760e023fa36