Merge "rpc_binder: Specify CID for vsock RpcServer" am: 80170d5f74 am: 14653b3d6f am: 10a8d94a79

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

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