Merge "libbinder: Duplicate channel handle in RpcServerTrusty"