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

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



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