Merge changes I65b06238,I1ebef60a into main am: 29deca77

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



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