Snap for 8581479 from 64c8b1727e3e80d515d7013455329b5f3a6acb7a to tm-qpr1-release am: 2e3baed60f

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

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