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

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

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