Merge changes I41978037,I19e8a9e8 into main am: 809aaeb9

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



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