Merge "RpcState: fix check." am: 3ff57c4a4c am: 6ee486a3de

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

Change-Id: I196337f5a5af2e47d8570d564e4d328dfb0a16ac