Merge "Remove VNDK definition(s)" into main am: f78d765724 am: 285025f4be

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2996868

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