Merge "binderRpcTest: mitigate hang" am: bf88c6ff7d am: 6b4e915755 am: 728710d2fc

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

Change-Id: I1c97b0f448ab92ded6dc661848924212ba25328f