Merge "Revert "Deprecating libvendorsupport_llndk_headers"" into main am: 244a63066b am: 886b9483c6

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

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