Merge "Fix FillEventHistoryTest failed on CtsAutoFillServiceTestCases"