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

Merge "Fix potential for dead binders when calling callbacks" am: bb0d4256 am: 551b9f8d am: 14f479cc am: be749b6f

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

Change-Id: Ifbd5c585c724b9314a5c3cc13f6352d4b1be66f1