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

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

Change-Id: Ibbc2d7637639467328568c8d685ff17bdd32d94f