Merge "Update the strings for the autofill enable dialog" into oc-dev
am: 0770f85cdc

Change-Id: Ia40ef434f7f67a8942496540360f5a5547eb8255