Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main...

Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1 am: e68edc80

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



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