Merge "Handle invalid PhoneAccountHandle for CarrierIdentifier"
am: 10ac0aafdd

Change-Id: If0ef06d93eaff3e7f86aa862ad396d0592dcc0e1