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: 3190352a am: a22cf96a
Change-Id: I0c2205a6e219ce40cae02a1243583d486abab6e8