Merge "Make TelephonyManager.getCdmaEriInformation and CdmaEriInformation hide@" into rvc-dev am: 2785cbd047

Change-Id: I028574fc65e8f746bd32fbe21f3b117400805a4b