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

Change-Id: I2494c9affb98b646c74bf4983eebaa1becc62ff7