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

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

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



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