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

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



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