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

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

Change-Id: I9ffcbb892f860a0aa2d96080056618ded909654e