Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 am: 6f126a8f5c am: 6cebca2599
am: 7fd676ee26  -s ours

Change-Id: I6a5d593a4291dbc25bb39c1f177539faccee0183