Merge "binderRpcTest: mitigate hang"