Merge "Add the string/dimen/style values for the new Auto-select network UI"