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

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



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