Merge "Add death recipient to TelephonyRegistry."
am: e42d29f31b

Change-Id: I20eb0b07a89b6dde2187339e28c0c3b50323370d