Merge "Autofill sample: Correctly autofill equivalent W3C fields." into oc-dev am: ea9d8486 am: d5d81c7b am: 9072d7a6 Change-Id: Ide46d37573e5884bb974e35e12ea560c55daeeb6