Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked...

Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into pi-dev am: 95d9a6c1 -s ours am: e3a1235c am: 8c91c69d -s ours am: 9f0317bd am: 40511521" into rvc-d1-dev-plus-aosp am: 76cbb343 am: ec596d91 -s ours
am skip reason: subject contains skip directive

Change-Id: Id2f5b9e7d4fd42d644fe10f051a5b72d564f8b03