tree f1368d9b6dcbcdbddacefcec1701b6204626caa5
parent 25bde8f19773a0edb459c3ffa87f989d689fb37f
parent 262a4f908f6cecf55d8795f649487fd73b29d9be
author Eric Biggers <ebiggers@google.com> 1704834674 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1704834674 +0000

Merge "Fix TrustManagerServiceTest failures due to PackageMonitor changes" into main am: 0cd23b3a00 am: d662113d97 am: 262a4f908f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2901314

Change-Id: Ie4f9b67ba356093189b451eef8d7cbe0fd218eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>