[automerger skipped] Merge "[DataStallRecovery] Fix the...

[automerger skipped] Merge "[DataStallRecovery] Fix the ArrayIndexOutOfBoundsException Problem" am: 5e0b00cf am: bbcf916f am: c932dedd -s ours am: 12d9e13e -s ours am: 2d075bf2 -s ours

am skip reason: Merged-In I84fb5b7286568a868af16108014956cada4bbb35 with SHA-1 ac639c33 is already in history

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

Change-Id: I1a3d49c9c4f2b0c8dcaa746a9e615247893eca71