[automerger skipped] Merge "Remove VNDK definition(s)" into main am:...

[automerger skipped] Merge "Remove VNDK definition(s)" into main am: 160c3d61 am: 09cf4502 -s ours

am skip reason: Merged-In Ic4f19113c1a25dc1fb60cdfbf9c0f2d8d7d09726 with SHA-1 09639b93 is already in history

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



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