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

Change-Id: Ia037bc71830226f5b2f6b266af4586233585c138