Merge "Seperate DataConfig update into Carrier and Device" into tm-d1-dev am:...

Merge "Seperate DataConfig update into Carrier and Device" into tm-d1-dev am: 95a73dba am: 60880acb am: c3020f2d

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



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