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