Merge "Fix potential for dead binders when calling callbacks" am: bb0d4256f4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1969041

Change-Id: I31cf0441b733f8ccf26c4fe1ebbb890f41b49855