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

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

Change-Id: Ia0ae75b436d687c37cd72aaca55d8c1d6544ca0d