Merge "SystemServer: reorder wifi services start"