Merge "Remove PlatformVndkVersion property" into main am: 6954bd2337

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

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