Merge "libbinder_ndk_unit_test: shutdown wait time to 20s" am: 3731f6de am: 2e2795df

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



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