Merge "libbinder: Duplicate channel handle in RpcServerTrusty" am: ad08ac9993 am: e7f263f145

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

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