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

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

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