Ömer Sinan Ağacan authored Jan 20, 2020 and Marge Bot committed Feb 05, 2020

Previously we'd override the existing {run,hc} opts in
extra_{run,hc}_opts, which caused flakiness in T1969, see #17712.

extra_{run,hc}_opts now extends {run,hc} opts, instead of overriding.

Also we shrank the allocation area for T1969 in order to increase
residency sampling frequency.

Fixes #17712