Merge "Remove AutofillManagerClient after AutofillManager is finalized"