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

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

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