[automerger skipped] Merge "Change logic of Data Call atoms to align with one...

[automerger skipped] Merge "Change logic of Data Call atoms to align with one datacall per DataConnection instance" am: dcc32a6c am: 374fd826 -s ours am: ddcd612b -s ours

am skip reason: Merged-In If0873962189414b4ce12fd58f3f8633434954647 with SHA-1 25f0eb57 is already in history

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

Change-Id: I9e0f82b05d5b8d41bb46076576969f7ffab1383a