Merge changes from topic "revert-3271699-IARRNEVQHI" into main am: 6c0a5d9d am: a8ecee9f

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



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