Merge "Use ro.vndk.version to check if VNDK is deprecated" into main am: 553da45cd7 am: 4c168fc64c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2762765

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