Merge "Clarify RpcServer shutdown error for corner case" am: 42c73a38 am:...

Merge "Clarify RpcServer shutdown error for corner case" am: 42c73a38 am: 68388d3f am: 8008b4de am: 88968f71

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



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