Merge "Fix NPE in AutofillManager when feature autofill is disabled" into sc-dev