Merge "Re-enable the removed-from-presubmit hotword tests (framework part)" into tm-dev