Merge "~RpcServer() calls shutdown explicitly." am: de10257e6a am: 4a0fad36e1 am: e028e46dfe

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

Change-Id: I775b03336a33d7c84c48335aa78aaac0cd4ed044