Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main am:...

Merge "Do not set BOARD_VNDK_VERSION and PLATFORM_VNDK_VERSION" into main am: 1d952f82 am: f74c3b5f

Original change: https://android-review.googlesource.com/c/platform/build/+/2949648



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