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

Change-Id: I160f14d16f9def7babe659aa60bff5af71f32f79