Merge "TrustManagerServiceTest: Fix broken tests" into main am: 042f3b9d43

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

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