tree 601ca94ce6c3f4a09c6d8f8b70b5c399f0f42605
parent 6b7ad80ec87cb362f28077b82986ea4ad685ea9a
parent 2b11ced7ccc51e16c73bc298f68fe9fcbe581f6e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1713308346 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1713308346 +0000

Merge changes I4a044e86,Ibf8b0feb,I2e1d7ac7,Icc61f2c3 into main am: 2b11ced7cc

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

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