Merge "binderRpcTest: mitigate hang" am: bf88c6ff7d

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

Change-Id: I4555dc11020b9daa02d9f8c16d1f1e6c61512876