Merge "Clean up DataSettingsManager calls" am: 81c6d766a9 am: 8937713e01

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

Change-Id: Ie7e6da48ea0f2a56a18b5c6efcd642d36c089e23