Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev