Merge "Avoid a race in autofill manager service." into oc-dr1-dev