[automerger skipped] Merge "Added the prototype of DataConfigManager" am: e52ade76 am: b0bfc858 am: e9ab2445 -s ours

am skip reason: Merged-In I4950c6990f7c987d2665ba996e69242258bba20b with SHA-1 2421f9dd is already in history

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

Change-Id: I8406ac17aeb414024ed7bb8e4f1be4d80781bd9a