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

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

Change-Id: Ic7bea025d69f3ea7f6388dfe6a01942cf5ae039d