Merge "Revert "libbinder_ndk_unit_test: shutdown wait time to 20s"" am:...

Merge "Revert "libbinder_ndk_unit_test: shutdown wait time to 20s"" am: d7fe03a9 am: 55416603 am: 375f8a76 am: 12bd8d35

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



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