Merge "Fixed CtsStatsdAtomHostTestCases test case names with Instant"