Merge changes from topic "deprecate-llndk-vendor" into main am: 30e45c6e am:...

Merge changes from topic "deprecate-llndk-vendor" into main am: 30e45c6e am: 734ece8f am: 6f234a8d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2886673



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