Merge changes from topic "b/215723302" am: 66e6466e0f

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

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