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

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



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