Snap for 8485725 from a8e9eb16de304ab85f0d123871f32b42533c94f4 to tm-qpr1-release am: 57616024e4

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/vts/+/17901850

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