[automerger skipped] Merge "Added the prototype of DataConfigManager" am:...

[automerger skipped] Merge "Added the prototype of DataConfigManager" am: e52ade76 am: b0bfc858 am: e9ab2445 -s ours am: be703227 -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: Ie992142f2c89cc7971e682c1867ce83a9662641f