Merge "Remove ro.product.vndk.version property" into main am: b81aa10e

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



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