[automerger skipped] Fixed out of boundary exception am: 376b8ce3 am:...

[automerger skipped] Fixed out of boundary exception am: 376b8ce3 am: fa638834 -s ours am: e04037f5 -s ours

am skip reason: Merged-In Icc019fcb4119b0e2b43faa80d5e16d01324409c8 with SHA-1 ab9b572b is already in history

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



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