Merge "Clarify RpcServer shutdown error for corner case" am: 42c73a38fc am: 68388d3f45

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

Change-Id: I473da2a933a3b33efe432a1e9fa819351d57f679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>