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