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

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

Change-Id: If652591fe427c4246a36f74cf6960a83bb158cdc