Merge "Telephony data refactoring API changes" am: f6a697293d am: 01c4416295

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

Change-Id: I875b0a8f19f19dbc0b38373b1e054ca9f8979572