Merge "No need to check product vndk version" into main am: 8fa8c076 am:...

Merge "No need to check product vndk version" into main am: 8fa8c076 am: b056db1d am: 2d41e533

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2763005



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