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

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

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