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

Change-Id: I1fd330eb730e14c03fce419c6ed39933340d7a2b