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

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

Change-Id: I462e1f8a8b17fa0d12e4139c58398c29c510bd98