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

Merge "libbinder_ndk_unit_test: shutdown wait time to 20s" am: 3731f6de am: 2e2795df am: 26be911c am: 4a2c298d

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



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