Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb