Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev