Merge "Clean up Wi-Fi Assistant card." into lmp-dev