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

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

Change-Id: I4673546c68263cd5d79d6c4c83585e8de81892dd