Merge "Use new TelephonyManager API to get CdmaEriInformation"