Merge "Update keyguard locked state from TrustManagerService"