tree 51d4a867bfc6b168daa51b878b5647550110cc42
parent 87f56fd74b2bc1bd314aae9881f75773f2b3601c
parent bfc578a7d7b1ee632b9aba4f4cd156c0f30c0b41
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583347280 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583347280 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Update keyguard locked state from TrustManagerService" into qt-dev am: 3c115495a0 am: 4dd9f6e113 -s ours am: 75b8097bc2 am: f44c574016 am: bfc578a7d7

Change-Id: I3a688efff3faecfa24d652ab3b5d3d0e30dd4a6e