Merge "Make TelephonyManager.getCdmaEriInformation and CdmaEriInformation hide@" into rvc-dev am: 2785cbd0 am: 43f41fe0 Change-Id: I52614f1547fb9b2e4d6c1f71766dd7fe279849be