Merge "Update carrier configs for DataConfigManager" am: 0c41c9bbbe

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

Change-Id: Ibb2c39ae570713aa8a099c4b92de54c0174fe6fb