Merge "libbinder: RPC flake mode fix" am: e9d9b27a64 am: 3158118bb0

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

Change-Id: Ia4a30017ed40f3196cf002a1edf8bec65096b2ca