[automerger skipped] Hook DataSettingsManager to the new telephony data stack am: 6bc9c8b59d am: d289d6bceb am: f04b1bdd8e -s ours

am skip reason: Merged-In I3b9f712fe23919ab6fb5a2c5b92dac64589fe4a6 with SHA-1 99e873351e is already in history

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

Change-Id: I9dc7cf1166f8c5bc6467b30bdc66e703a565b26e