Merge "Do not check with vendor vndk version" into main am: 6d01651a am:...

Merge "Do not check with vendor vndk version" into main am: 6d01651a am: 9062abf0 am: fcdbce7f am: 3147ebc6

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



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