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

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

Change-Id: Ica25135939fcbb75f8caa596e5dd23a3405f5c38