Merge "Telephony: Make IccFileHandler use ci instead of phone"