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

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

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