Merge "Renaming PATH_SEGMENT constants in SimPhonebookProvider" am: b1d0a4efb0

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

Change-Id: Ic2a9a5f8faf99d94cc152951d2d4d05a8b5b979d