[automerger skipped] Merge "Telephony data refactoring API changes" am:...

[automerger skipped] Merge "Telephony data refactoring API changes" am: 226665b6 am: 865b4587 am: 3ed6a34e -s ours

am skip reason: Merged-In I0bd1445a1aacec7ac22fcabe04a2110a32ddf2a2 with SHA-1 485fec00 is already in history

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

Change-Id: I71693912f3a9a3093b1c1195f7f2e6bbcd728d2e