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

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

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