Merge "Clean up DataSettingsManager calls" am: 81c6d766a9

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

Change-Id: Ie99556185f6b328e905bd98dd76cab3291cf6899