Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43 am: 6f126a8f5c
am: 6cebca2599

Change-Id: I8cfaadb7dd8df6d81695dea8530a25de69fcce3d