Merge "Merge "Use DataSettingsManagerCallback for new data stack" into tm-dev...

Merge "Merge "Use DataSettingsManagerCallback for new data stack" into tm-dev am: 8dee0d55 am: a516ba34" into tm-d1-dev-plus-aosp am: b491a9f0

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



Change-Id: I5d11473a69be6056ad0882544203101d1eec0c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>