Merge "Renaming PATH_SEGMENT constants in SimPhonebookProvider" am: b1d0a4efb0 am: 23d8931da9

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

Change-Id: I9f9e634f4a033055e1232e529ae476fa70a905a1