Extend prune_comp_type_by_model_rd speed feature for speed 3

Introduced prune_comp_type_by_model_rd speed feature for speed=3.

For speed 3 preset, BD-rate impact is seen as 0.04% (as per AWCY runs),
with encode time reduction of 2.46% (averaged across multiple test cases).

STATS_CHANGED

Change-Id: I8ea3b82b5748d33f053a206b506ac699b52717ec
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index d873430..11b349c 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -334,6 +334,7 @@
     // it with cpi->sf.disable_wedge_search_var_thresh.
     sf->disable_wedge_interintra_search = 1;
     sf->perform_coeff_opt = is_boosted_arf2_bwd_type ? 2 : 3;
+    sf->prune_comp_type_by_model_rd = boosted ? 0 : 1;
     sf->disable_smooth_intra =
         !frame_is_intra_only(&cpi->common) || (cpi->rc.frames_to_key != 1);
   }
@@ -351,7 +352,6 @@
     sf->alt_ref_search_fp = 1;
     sf->skip_sharp_interp_filter_search = 1;
     sf->perform_coeff_opt = is_boosted_arf2_bwd_type ? 2 : 4;
-    sf->prune_comp_type_by_model_rd = boosted ? 0 : 1;
     sf->adaptive_txb_search_level = boosted ? 2 : 3;
     // TODO(any): Experiment with the early exit mechanism for speeds 0, 1, 2
     // and 3 and clean-up the speed feature