Merge "binderRpcTest: work when vsock not supported" am: bf5fdedf6f am: 81809face4 am: 43f81cefc6

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

Change-Id: Ifff987fb2ac358af3becd0734266fdd1d144c226