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

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

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