Merge "Add WiFi toggle prompts - framework" am: 584b5cee49  -s ours
am: 31082a0824  -s ours

Change-Id: Ib2d485f7c6904fc3890c08f34d52703b92d379b5