Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495a0
Change-Id: I61ae5b51dc86ce7eb39ff669bf499a4a2235523a
This commit is contained in:
3c115495a0
Change-Id: I61ae5b51dc86ce7eb39ff669bf499a4a2235523a