Merge "RpcServer: be thread safe" am: 379dbd1ca4 am: 88deb30faf am: 384441842b

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

Change-Id: I0ed7aa479e06d5b2acd1c5c2c746530929e2f282