Merge "[rpc_binder][test] Merge unixBootstrapFd and socketFd in binderRpcTest" am: a8c0dd747c

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

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