Merge "binderRpcTest: allow unsupported vsock family" am: eeaff65a18 am: 97a1411352

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

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