Merge "binderSafeInterfaceTest: avoid zombie" am: 23e1491724 am: ff598fb20c am: 19f051ee83

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

Change-Id: Ib66d4fa0ffa250102bed546ad151f4e55fa2baa4