Merge "Don't auto-connect to networks that have no/limited connectivity."
am: a5b124cce3

Change-Id: Ic9b0dc49b13656447bdcde85e624936cc04cee7c