Merge changes from topic "no-llndk-versioning" into main am: 33a0c3ca1f

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

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