[automerger skipped] Merge "Reset data retry with more scenarios" am:...

[automerger skipped] Merge "Reset data retry with more scenarios" am: 261945ce am: 46102997 am: e86563bb -s ours am: 8bfd2392 -s ours

am skip reason: Merged-In If0cf478a6ef9fc7b0ca3d24043c7f04c9339cec5 with SHA-1 6e827dfa is already in history

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

Change-Id: I26215a2c2ef583eafe91a4632fcdfbcec71d7401