[automerger skipped] Merge "Support data profile merging" am: 9d1d82ae am:...

[automerger skipped] Merge "Support data profile merging" am: 9d1d82ae am: 0f82e355 am: 3e0355f8 -s ours

am skip reason: Merged-In I73d20f97ea1098e19adab370ec3cc7e61eb6204c with SHA-1 c97257ec is already in history

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

Change-Id: Ic39df2d4cc53288025ffbb64a64498c24a5f5df3