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

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

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