Merge "binderRpcTest: fix CallingId test failure"