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

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

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