Merge "Dump autofill service component from settings." into oc-dev
am: d3ed35f690

Change-Id: I5391e2d13d3555310e6a3e8f23f95aa4389b9aaf