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

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

Change-Id: I7a81a23f4717f89420a3989891f872bca6e8ebd3