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

Change-Id: I9dd54beb08f771be886c03fa0f8a3335f574c47c