Merge "Fixed out of boundary exception" into tm-dev am: 8f2b66b8 am: 3c995829

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



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