[automerger skipped] Merge "Don't auto-connect to networks that have no/limited connectivity." am: a5b124cce3
am: ebdd783a9b -s ours
am skip reason: change_id I5413393529c4bad3a707df229307542486bcff33 with SHA1 c0e461f2d9 is in history

Change-Id: I116cea63ccbfd5346ca218486671abae5176c273