Merge "binderRpcTest: allow unsupported vsock family" am: eeaff65a am:...

Merge "binderRpcTest: allow unsupported vsock family" am: eeaff65a am: 97a14113 am: b25e8b6a am: 49ac5525

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



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