Merge "libbinder_ndk: Shim llndk-versioning on Trusty" into main am: 1be31535 am: 1b4cc437

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



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