[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: 9926088c -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: I9b700b86e97c319187f645ed5ff7593cc8950874