[automerger skipped] Merge "Fix potential for dead binders when calling...

[automerger skipped] Merge "Fix potential for dead binders when calling callbacks" into sc-v2-dev am: 74983c12 -s ours am: 6de85cf0 -s ours

am skip reason: Merged-In Ibfe82fb187b7989164e22919a72b8c36d2655902 with SHA-1 5a7e3797 is already in history

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

Change-Id: I6af2b1a8c9af7339bc96b1fd1dc91c4483bb06da