[automerger skipped] Merge "Migrated DataServiceManager to the new package"...

[automerger skipped] Merge "Migrated DataServiceManager to the new package" am: c0bbfb95 am: 3883988d am: 7ba430fc -s ours am: 821d38b3 -s ours am: 25b3d466 -s ours

am skip reason: Merged-In I1baf620f76ab9043d8404553123871fb1ca3604c with SHA-1 51e49b83 is already in history

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

Change-Id: I0778c3f9d6e26d87b76660ea3aa1013eb6bd39fd