Merge changes Ib2667798,I9a1fa32b into main am: 4cbd4981 am: 31f5c0d7 am:...

Merge changes Ib2667798,I9a1fa32b into main am: 4cbd4981 am: 31f5c0d7 am: 632e6360 am: b8246fba am: 2da00b66

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



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