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

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

Change-Id: I8a61c4eaa7243fa0509c2ec9d09d6be7e0eda30b