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

Change-Id: Ia6bb68c658a739bc32e5eaaade18629d44f2c2bd