Merge "libbinder: fix trusty cpp fd transport modes" into main am: 33da0c23

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



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