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 am: 7fbbec8a am: 1a40bfd0

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



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