Merge "RpcServer: be thread safe" am: 379dbd1ca4

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

Change-Id: I36e04efbe183e0eea7d28fee2c998abc7ec807e8