Merge changes I046d75db,Ie13817dc am: d2aa190bdc

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

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