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

Change-Id: Ia770310f6135df041bc1d84b09cfbdcda1debd2f