[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev am: 7e2e4be8 am: bc78c05c -s ours

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

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070332

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

Change-Id: I54e04e2d219c851a961104f744826877172c76ea