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

Change-Id: I8c9e38ee6ef803cd496f3661e7b6e42cf89af5b1