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

Merge "Optimized data retry" into tm-dev am: b8a0c775 am: 660c3049 am: 574b55f0 am: 80e20126

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



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