Merge "libbinder_ndk_unit_test: wait slightly longer" am: ec7fa9d3 am:...

Merge "libbinder_ndk_unit_test: wait slightly longer" am: ec7fa9d3 am: 1eab5843 am: 3f502b19 am: 3f049336

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



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