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

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

Change-Id: If9f4f4299b33c67aea1d90e1b1e47f0947e08679