[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495 am: 4dd9f6e1 -s ours am: 75b8097b am: 92f3bfb0 am: 2a048d06 am: 523f5430 -s ours
am skip reason: subject contains skip directive

Change-Id: I2cb2b7180aee46b24fab5360670b5a9f0b43ad67