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

Change-Id: Iac9a8bf0430652396809784598ed75f947b75426