Merge "Fix secondary lock screen implementation such that DevicePolicyKeyguardService calls are made on the main (UI) thread." into rvc-dev am: eb31eb5bae

Change-Id: Id317e6ba6e445831043e7ab17d0f28af54aa44b2