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
Change-Id: Ib0794f0b8520222cd6eb96daaa1b2a0413074cde