[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into pi-dev am: 95d9a6c11c -s ours am: e3a1235c4b am: 8c91c69d32 -s ours am: 9f0317bdd2 am: 40511521d9 am: 42c2023ded
Change-Id: If790daeac9c2fdec58055103509aa45f94919dba
This commit is contained in: