Merge "binderRpcTest: fix CallingId test failure" am: f787d5b524 am: 7faaa32194 am: 0ff5b9cc15

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

Change-Id: I1a3afcb4acc016da961f8f0acd9d10e701697389