Merge "Handle IndexOutOfBoundsException for IMEI & MEID substring" am: 2de0c7d039 am: db89b3d2aa am: eda2c5ea1c am: 9cdaa281c2 am: 67f2fc8bbf

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

Change-Id: I968e9477284b9e7d08b00a167331bf3f89310c23