[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: bfc578a7 am: 02bf4869 am: 25f13398 -s ours
am skip reason: subject contains skip directive

Change-Id: I149ed12e73707bbd37cafb15132f0feaed0e8387