Merge "Fix for flaky test in binderLibTest" am: 1d06201d05

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

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