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

Change-Id: I1e94b6e3601078b9f999f5f33a3d8425035de8c2