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 am: ed056364
Change-Id: I1d2731860a0df86f4aba599aaeef0df043d74a00