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

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

Change-Id: Ideb3d9e014755c0f8ca4321f8ed1a59027517597