[automerger skipped] Merge changes from topics "data_config_manager",...

[automerger skipped] Merge changes from topics "data_config_manager", "data_refactoring" am: 4a3ecd2e am: 8837faa5 am: 213b04f7 -s ours am: e05076a3 -s ours am: 91ca0555 -s ours

am skip reason: Merged-In Idfb3423e3908944737ba1c1d4a6602e53ec7d467 with SHA-1 cced483f is already in history

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

Change-Id: I5c1b9396820359166911b2294be13aa27d04e933