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

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

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