Merge "Revert^2 "Deprecating libvendorsupport_llndk_headers"" into main am: 92d1597718 am: cb57a87502

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

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