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

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



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