Merge "Merge "Fix secondary lock screen implementation such that...
Merge "Merge "Fix secondary lock screen implementation such that DevicePolicyKeyguardService calls are made on the main (UI) thread." into rvc-dev am: eb31eb5b am: c20ac39f" into rvc-d1-dev-plus-aosp am: bdabd86c am: aeae7777
Change-Id: Ie3d9f75b17a0ffee61c1e5f24939fbe2af269557