[automerger skipped] Merge "Clean up DataSettingsManager calls" am: 81c6d766a9 am: 8937713e01 am: 418fd43934 -s ours

am skip reason: Merged-In I3b681c8efde2eb2a6e468e14e01b9297f20633c2 with SHA-1 2c094c50c1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2032431

Change-Id: I3065d5075396e457568c6ef233632251a3a6d605