Merge "libbinder: double cost for incorrect wait config" am: 58def21d am:...

Merge "libbinder: double cost for incorrect wait config" am: 58def21d am: 834ba711 am: 3bb10a74

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



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