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

Change-Id: I37fe61c02a960ab5024fca8ab025c8e1933d269b