[automerger skipped] Added data retry support am: 85264cba -s ours am:...

[automerger skipped] Added data retry support am: 85264cba -s ours am: 5079af18 -s ours am: c1ec85ee -s ours

am skip reason: Merged-In Ifc26a8550e272618b59e5a566de803a63921da08 with SHA-1 22603e8d is already in history

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

Change-Id: I06e405ca30c956961ebeac3d9814746bcb9874dd