[automerger skipped] Merge "Update DataServiceManager with new...

[automerger skipped] Merge "Update DataServiceManager with new CarrierConfigManager APIs" am: 80f016c2 am: 264d825a am: 7234a35d -s ours am: e1639993 -s ours am: d221228b -s ours

am skip reason: Merged-In Ie4ec6290488ba3c3b59dff2b917462f17aca0059 with SHA-1 f00ca988 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2481116



Change-Id: I311e06795a33115bb69bced030dce67dab09862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>