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

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

Change-Id: Icd13bc08a2d704896ef71844c5925a891fc46305