Merge "Fixed out of boundary exception in data retry" into tm-dev am: 63ec5218

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



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