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: 2ac7f0f7 am: 3b3e183c am: ae0c4a34
Change-Id: I17fe597a102bc6c2715d51c0afee6e281c1d0d89