Merge changes from topic...

Merge changes from topic "revert-3341364-revert-3334193-no-llndk-versioning-YOLDNTJGYM-WNBIDIAVJA" into main am: 6445f916

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



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