[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into pi-dev am: 95d9a6c11c -s ours
am skip reason: subject contains skip directive Change-Id: I09e99b330c3000605f37270399916b75c00160e8
This commit is contained in: