Merge "Attempt to deflake CtsStatsdHostTestCases" into sc-dev