Merge "Add Sim categorization Java API to ContactsContract"