[automerger skipped] Update DataConfigManager with new CarrierConfigManager...

[automerger skipped] Update DataConfigManager with new CarrierConfigManager APIs am: 2df00896 am: 58ab42d4 am: d9a6c39e -s ours am: 473130a0 -s ours am: c40f9439 -s ours

am skip reason: Merged-In Idcf5c4ce96b48dd6da6b14f1f3b8f66842108c82 with SHA-1 9083d338 is already in history

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



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