tree 6a1191f004dfe0d0f899032041e64a6861df607f
parent 2130fd70bb050cbf31e4beb0b9f7db8caf5d934b
parent 3c115495a001e45c18a32bb8ed20698c2425b5a8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583344719 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583344719 +0000

Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495a0

Change-Id: I61ae5b51dc86ce7eb39ff669bf499a4a2235523a