Merge "Fix and improve TrustManagerServiceTest" into main am: 4535627fed am: cfaaa757e6

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

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