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

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



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