Merge "Changes to reduce flakiness of TrustTests" into tm-dev am: 0d97e88c

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



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