Merge "Remove VNDK definition(s)" into main am: 160c3d610c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2994440

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