Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a

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

Change-Id: Iec83a93593e52cdb2baf12fa76c70af9df263ee4