Merge "Fix the second augmented autofill request timed out issue by setting the right callback in the AutofillProxy"