Merge "libbinder: Add __assert in Trusty" am: 6931548346

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

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