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

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

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