Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d

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

Change-Id: Iaae4195d164780d6e167c8181ecb62ef021d4439