Merge "linkToDeath exception cause system server crash" into rvc-qpr-dev am: 4ec6ae5ffd

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

Change-Id: I2c50adedd5dec7f0c509963ca2ac56c066090954