Snap for 9930594 from 85934ee06375f86300beb453e8fe41f11f69c0c8 to udc-release am: 58e389be69

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

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