Merge "Rename functions in libvendorsupport" into main am: f27d8cebbd am: ca95bfc10e

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

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