Merge "Binder: disambiguate unlinkToDeath error" am: 4600169731

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5363cdd0c0daadfcc326aa7688aa030703242a2