[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state...

[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495 am: 4dd9f6e1 -s ours am: 75b8097b am: f44c5740 am: 1fa13976 am: d1f39167 -s ours
am skip reason: subject contains skip directive

Change-Id: I2c6affab73b5092c0dc6a532cc8ec805adff9fab