Merge "Renaming PATH_SEGMENT constants in SimPhonebookProvider"