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

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

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