Merge "Make TelephonyManager.getCdmaEriInformation and CdmaEriInformation hide@" into rvc-dev