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

Change-Id: If651c4d88017c439432dd93b21944fc43a36dfe3