Merge "binderRpcTest: assert on wait_for timeout" am: 453334da am:...

Merge "binderRpcTest: assert on wait_for timeout" am: 453334da am: 91327817 am: c1438662 am: 29d6ddfc am: 12528b18

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



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