Merge "WFD: modifications to set net_admin capability for wfdservice"