Merge "Add TrustManagerServiceTest to postsubmit" into main am: f7dbfc60bd am: 7fa405dd98

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

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