Merge "RpcState: fix check." am: 3ff57c4a4c am: 6ee486a3de am: 155d0c0ecd am: 124001e1c7

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

Change-Id: I1d117f738b57de9b577f4472ea181899db723d37