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

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

Change-Id: Ie8202a904494f570f2d894947337f05066d35992