Merge "Add WiFi toggle prompts - framework" into stage-aosp-master
am: 9f078049cf

Change-Id: I28501fc58e597c1f5e9d4da6bfaa3a015cad1260