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

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



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