Merge "libvendorsupport provides an API to replace vndk version" into main am:...

Merge "libvendorsupport provides an API to replace vndk version" into main am: e4518372 am: 5c77913f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3066522



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