[automerger skipped] Fixed out of boundary exception in data retry am:...

[automerger skipped] Fixed out of boundary exception in data retry am: bdfd3764 am: e465b085 -s ours am: 67ce4a8b -s ours

am skip reason: Merged-In I8ba7dc03e80bddb351ddf264a18c096ee3d50792 with SHA-1 8be0f605 is already in history

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



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