Merge "Use llndk.libraries.txt from system if VNDK is deprecated" into main...

Merge "Use llndk.libraries.txt from system if VNDK is deprecated" into main am: b2d6cc2e am: 95c85d27 am: a8e994b0 am: c5414a7c am: 423deec6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2703694



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