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 am: 9312e6a7

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



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