[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev am: 0618d4e9 -s ours am: a67adc98 -s ours

am skip reason: Merged-In Ibc351645308676ed188f748972eb6312c9cbd64f with SHA-1 800d1140 is already in history. Merged-In was found from reverted change.

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

Change-Id: I3bcf25fe4236993b2c570aa496f9359d6e34c424