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 am: 1d6d282e am: ac82ecf7

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



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