tree c84798b36fbfb414bb22f01dce0c3a44b6c2fbdf
parent de55c1fff9f36312e9241016c155246afdf011f2
parent f37928716b553ce0a4ab2bd4ea33af81898f7c5e
author Treehugger Robot <treehugger-gerrit@google.com> 1646680764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646680764 +0000

Merge "CarrierConfigManager changes for DataConfigManager" am: 087198296d am: f37928716b

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

Change-Id: Ic2e7e9ce48ada1ee15ead37055a49c209190f437