Merge "Binder: disambiguate unlinkToDeath error" am: 4600169731 am: 04b996abf6 am: 8979d72394

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ef7cc1332f57c437781d71f825f750fc574a3d4