Merge "libbinder: fix flake-mode build" am: ba0567443c am: f4a02f342f am: dae3be6415

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

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