[automerger skipped] Merge "Move definitions from CdmaEriInformation to...

[automerger skipped] Merge "Move definitions from CdmaEriInformation to TelephonyManager" am: feab0845 am: 27ee6117 am: fb02ea3c am: bc971e93 -s ours

am skip reason: Change-Id I218dfcc6ad73b09961d5cfbec898c0c36c804d9e with SHA-1 59fab667 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1505154

Change-Id: Ic7e8e2da05a9809ce1e41b7a719479850a69bc60