Merge "Autofill optimization: don't contact server when session is finished." into oc-mr1-dev
am: 2748ffcef7

Change-Id: I912d263f40e3d1cc58c77f2a91c585bb97aa3c37