Merge "Add the string/dimen/style values for the new Auto-select network UI" am: 2eb07c0a4c
am: 8e32666f13

Change-Id: I1dc816e4989835f25ad35301dd499e35c6e11880