Merge "Add WiFi toggle prompts - framework" into stage-aosp-master