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

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

Change-Id: Iae87d0d571e8d4668bafc778642aa4639bb0fbbc