Merge "autofill service search uri is not backed up" into oc-dev
am: 919076aa2a

Change-Id: Ifc93582b3549df369d7f22536f53edd417623b5a