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

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

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