Merge changes I7a102fa1,Ic3156e53 into main am: 97409cd9a2

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

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