[automerger skipped] Merge "Update carrier configs for DataConfigManager" am:...

[automerger skipped] Merge "Update carrier configs for DataConfigManager" am: 0c41c9bb am: adf414d7 am: e5baa95b -s ours am: 6113844d -s ours

am skip reason: Merged-In I49e61b47a47a8db6ed3e0c8d5fa7e9b353e69edd with SHA-1 69f721eb is already in history

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

Change-Id: I55cd3c15fc8788ffc96fe79184c02f56929a0ac5