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

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



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