Merge "Add a "Don't ask again" checkbox to the avoid bad wifi dialog." into nyc-dr1-dev
am: 2c7c84a1cd

Change-Id: Ie98b23d5d81afffcd02fee7339dbe50172a194ae