Merge changes from topics "presubmit-am-5af13e92c3164470b7a9cd1bad20005d", "presubmit-am-f9d8a5a0c94c4482ac55b4cb0f789cb0" into tm-dev

* changes:
  Revert "SF: Add composition strategy prediction stats"
  Revert "SF: Enable HWC composition strategy prediction"