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

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

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