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

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

Change-Id: I5441e9aa85f538091ad0b6c54bd5e9b7a88eec67