[automerger skipped] Merge "Telephony data refactoring API changes" am: f6a69729 am: 01c44162 am: 7528c230 -s ours am: b31fc2be -s ours

am skip reason: Merged-In I3f188921b92b4a14c323819ff58ab9ae57488937 with SHA-1 3c3c522c is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2011720

Change-Id: Icf8c86d48b3fa21c20b3c0a7db7e8f0328e38eb8