Merge "Move disable autofill from AutofillManagerService to AutofillOptions."