[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: 9be6d3a4 am: 7772ddc1 am: 40cb1d90 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic1539075e93ff7ac0427105fdfff3d212db0ba58