Merge "Split testAutofillManuallyOneDataset into 2 tests."