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