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

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

Change-Id: I3efaf6a14812e538b52a2cca719d4795f2439364