Merge "libbinder: fix flake-mode build" am: ba0567443c am: f4a02f342f am: dae3be6415 am: 1e7302bd7f am: 682bb4a7b9

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

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