Snap for 8671863 from 3ce1d5822735ed390a8f1a60cf6cb4bea4c6041b to tm-release am: 1434f4d6d4

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

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