Merge "Merge "Don't auto-connect to networks that have no/limited connectivity." into qt-dev am: a85d8ba084 am: 74f7be63fc" into qt-r1-dev-plus-aosp
am: 868099b268

Change-Id: Ia5d3be740cf1403832833328302eddaab92ed168