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 am: b94f5ee9

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



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