Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/23388806 Change-Id: Ib153a41f17ce7dedec77a5560c01b66a7ae728b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>