Merge "Don't build VNDK on GSI" into main am: 1f9ba9c4 am: 00497618 am: fa2e92ad

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



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