Merge "binderRpcTest: BinderRpc.Java skip on user builds." am: bec007aad9 am: a35efd5363

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

Change-Id: I34255fbe08ddac8f631e9c4065417dc50b94de0b