Merge "Added missing important-for-autofill mappings." into oc-dev
am: b8305e9186

Change-Id: I5f229b698cea897cc63e42991084194b272c8c30