Merge "Telephony data refactoring API changes" am: f6a697293d

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

Change-Id: I64a1b5d3ffdc0b9996d7d8d6ed6b292b3a34752e