Merge changes from topic "b/273282046" am: 56df091391

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

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