Merge "Move all GKI targets away from non-AB" into main am: e2c0992a

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



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