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

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

Change-Id: I9733d0c4848ee0f9827216fa9816d32ddf35bd11