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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e068a62e49c86f9f98d19031f6a7c082199b6ab