Merge "Fix TrustManagerServiceTest failures due to PackageMonitor changes" into main