[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: c1ebbd32 am: 36ffb44f am: 24daf02a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0ea933cb5eaac54d227d42631c155198fafd227