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

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

Change-Id: Icede7f31271df6afaffd0f99ab85d75dfc129afb