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

Change-Id: I05a534efbedc146a8df0d0fb6dca873803fc6450