Snap for 8445529 from 153759ac4f9d3bf9f583816b13a37447950dd74f to tm-qpr1-release am: 3f55b1a478

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

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