Merge "Don't throw exception if phone process is dead for carrier ID APIs" am:...
Merge "Don't throw exception if phone process is dead for carrier ID APIs" am: 8c329549 am: 0713fcf6
am: 9af710c5 -s ours
Change-Id: I9361259e27ffea1ec358323f57cc4681c7c5e991