Snap for 8479413 from c25454a0d5ee92d6d882ae9774063d4c7123cb5e to tm-release am: 29b7d46f8f

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/17872008

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