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

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

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