Merge "Fixing the bug where secondary lockscreen intent is sent to the admin...
Merge "Fixing the bug where secondary lockscreen intent is sent to the admin receiver but no the service." into rvc-dev am: 6dc855e1 am: 4051c942
Change-Id: Ic3583c9f0b66384bedc16f3fe92e1a29325bb7be