Merge "Optimized data retry" into tm-dev am: b8a0c775 am: 660c3049 am:...

Merge "Optimized data retry" into tm-dev am: b8a0c775 am: 660c3049 am: 1171602b am: 852b9004

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



Change-Id: I12383ff79ed083963eead23ed2f84609003cd57d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>