[automerger skipped] Merge "Telephony data refactoring API changes" am: f6a697293d am: 01c4416295 am: 7528c23011 -s ours

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

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

Change-Id: Ic6ddf18f75035ac21ac643173095efa8e5cc7fc2