Snap for 8458224 from 0f7b38472d2bb9ccc5c1ef55bc7b22a0ea68ef9b to tm-qpr1-release am: 313a6b152e

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/asuite/+/17771238

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