Merge "Unthrottle data retry in some conditions" into sc-dev am: 8c891c10

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

Change-Id: I9e89cef1054448b058a327744f8273e5ebc77489