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

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



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