Merge changes from topic "revert-3334193-no-llndk-versioning-YOLDNTJGYM" into main am: 7ef014b3dd

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

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