Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am:...

Merge "Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config" into main am: f81405aa am: a1822c5b

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



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