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

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

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