Merge "Restore original use of llndk annotation" into main am: 34f8fbd450 am: e56c8c3a68

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

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