[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 am: 42c2023d am: f8a23c73 -s ours
am skip reason: subject contains skip directive

Change-Id: If51f0267e7cab63c675485a7c80984e98f59d9df