Merge "Revert "Change logic of Data Call atoms to align with one datacall...

Merge "Revert "Change logic of Data Call atoms to align with one datacall per"" into sc-dev am: a5e1920b am: b8e4d512 am: 33373687

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

Change-Id: I160ec740e95f649e18773fbd3a36fef856b2c054