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

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



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