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

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

Change-Id: Id0258e1a468f4b33141f45420913d3276764b04e