Merge "Remove VNDK definition(s)" into main am: 3bd01f6482

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2997438

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