Merge "RpcServer::establishConnection: make static" am: bb2cca75ef am: 3f3559a5eb

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

Change-Id: I991255372a98e4ab60460619bac6b56ad918fbc9