Merge "binderRpcTest: assert on wait_for timeout" am: 453334dab3 am: 9132781781 am: c1438662aa

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

Change-Id: I03da814f25c4c4c126dd9c682e64ad9f25d58e4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>