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

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

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



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