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

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

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