Merge "Revert "Remove trusty-specific llndk-versioning.h."" into main am: 7ddc826431 am: 999d76ffb2

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

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