Merge "[rpc_binder][test] Merge unixBootstrapFd and socketFd in binderRpcTest"...

Merge "[rpc_binder][test] Merge unixBootstrapFd and socketFd in binderRpcTest" am: a8c0dd74 am: 440eb8fd am: ec020bd5

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



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