Merge "Fix secondary lock screen implementation such that...
Merge "Fix secondary lock screen implementation such that DevicePolicyKeyguardService calls are made on the main (UI) thread." into rvc-dev am: eb31eb5b am: c20ac39f
Change-Id: I2722dbab1511809a5f3d60e18fc841a96459b6ac