[automerger skipped] Merge "CarrierConfigManager changes for DataConfigManager" am: 08719829 am: f3792871 am: f038fd96 -s ours am: 809f8f80 -s ours

am skip reason: Merged-In Ie4fc79646b58d7daf167958b579df84889b65ade with SHA-1 8346963e is already in history

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

Change-Id: Ic783745d16a2de333c442b37e897bcccbd9b3dab