Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d am: f37928716b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2009011

Change-Id: Ic2e7e9ce48ada1ee15ead37055a49c209190f437