Merge "Handle IndexOutOfBoundsException for IMEI & MEID substring" am: 2de0c7d039 am: db89b3d2aa am: eda2c5ea1c

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1844466

Change-Id: Ia69ae6b59dcd12b913b756704f04ad8c5fe3297b