[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495a0 am: 4dd9f6e113 -s ours am: 75b8097bc2
Change-Id: I83ab95ccdf1ef1fe6bbc3dc6fb82e2f261bbea64
This commit is contained in: