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

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

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