Merge "Handle invalid PhoneAccountHandle for CarrierIdentifier"