[automerger skipped] Merge "Update DataProfileInfo references" am: 0f79e4dd...

[automerger skipped] Merge "Update DataProfileInfo references" am: 0f79e4dd am: 3203c277 am: 0d994dc1 am: 242baad9 -s ours

am skip reason: Merged-In I31e0c922887546c9438ce99dc8cfd0acc7dd49b7 with SHA-1 6d62af38 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1934664

Change-Id: I465b2e94b46c90566f5c102fef899d5d9f98ec15