Merge "Do not check with vendor vndk version" into main am: 6d01651ab9 am: 9062abf0e5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2758806

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