Merge changes from topic...

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

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



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