Merge changes I8d060594,I2b6a57ae into main am: 5d55b668

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



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