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

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

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