Merge "Refactor CdmaSystemSelectListPreference"