[automerger skipped] UpsideDownCake/34 is now REL am: e9184d75 am: df79de7f -s ours

am skip reason: Merged-In Iaa3054f3449a5bf6887c24937646d22c79c4af1e with SHA-1 e9184d75 is already in history

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



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