Merge "Refactored AutofillManager service classes into common code."