Merge "binderRpcTest: stronger check for synchronous cbs" am: b9a88146 am:...

Merge "binderRpcTest: stronger check for synchronous cbs" am: b9a88146 am: 637ef737 am: 18276414 am: 9028bffe am: 1a7728a6

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



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