Merge "libbinder: Add __assert in Trusty" am: 69315483 am: 5c24cf3e

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



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