[automerger skipped] Merge "Update DataConfigManager methods" am: 2f881e2e...

[automerger skipped] Merge "Update DataConfigManager methods" am: 2f881e2e am: 55391610 am: 64254950 -s ours am: 8d796555 -s ours

am skip reason: Merged-In I81d580679fe7606dcdbee10f9d34a8db2bdd30a2 with SHA-1 61952ab2 is already in history

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

Change-Id: I7e04350aebbce55c6ccf32e198717d113bcf6d57