Merge "Revert "Add GSI targets using soong built system image"" into main am:...

Merge "Revert "Add GSI targets using soong built system image"" into main am: 20f853cb am: 9728a23f

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



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