Merge "RpcServer: expose server fd" am: e81f29d204 am: fbbcccc723

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

Change-Id: I6155828959bf4daf40f7c4eb7db1c473cdae29b7