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

Change-Id: I0281f56f8f06c69754d0559cc1e72dc248050aad