[automerger skipped] Added data retry support am: 22603e8d am: ca0aaca9 -s...

[automerger skipped] Added data retry support am: 22603e8d am: ca0aaca9 -s ours am: 7fca3d62 -s ours am: e4af2ead -s ours

am skip reason: Merged-In Ifc26a8550e272618b59e5a566de803a63921da08 with SHA-1 8b4787a8 is already in history

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

Change-Id: Ic99e809a4b8b1820bc353fa73f880a81812948af