Trump seeks 2-year deadline for infrastructure reviews in new plan