Merge "libbinder: Fix binderRpcTest flake" am: 3e7dd2435d am: d0a3d20a57 am: faefdfffad am: ae19b985e1

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

Change-Id: I6ef61a13c748d8c96b4e62c5d80f392654bbd931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>