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

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



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