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

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



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