[automerger skipped] Revert "Cherrypick from:...

[automerger skipped] Revert "Cherrypick from: https://android-review.googlesource.com..." am: a3f4ee51 -s ours

am skip reason: Change-Id Ia9303dd1fd137e227b22db1a433bcf7140f083a5 with SHA-1 e004fc4d is in history

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

Change-Id: I0938c555c78769adb840369641f7db32dfeff4ad