Merge changes Ia693c4a5,I8e5620d2 into main am: c14be38f

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



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