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

Merge "Revert "libbinder: double cost for incorrect wait config"" am: 1b5ab7cd am: 233a12d0 am: cf7953f7

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



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