[automerger skipped] Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d am: f37928716b am: f038fd9687 -s ours am: 809f8f8062 -s ours
am skip reason: Merged-In Ie4fc79646b58d7daf167958b579df84889b65ade with SHA-1 8346963e30 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2009011
Change-Id: Ic783745d16a2de333c442b37e897bcccbd9b3dab
This commit is contained in: