Merge "Don't throw exception if phone process is dead for carrier ID APIs" am: 8c32954906
am: 0713fcf66d

Change-Id: Iacf464a898da538795152135b0c40cd648bbdf7d