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

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



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