Merge "Changes to reduce flakiness of TrustTests" into tm-dev am: 0d97e88c02 am: 9adbb5ed45
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17391844 Change-Id: Ic11a860c8660c57df60441299f611e31f4b73017 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: