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