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 am: fa98cd45

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



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