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