Snap for 8414339 from 926b984280670d98e53d692c99641866b832fbc9 to tm-qpr1-release am: 2e93499aa2

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

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