Merge "Fix AutofillManager NPE"