Merge "Implement the rest of autofill importance modes" into oc-dev
am: 70c0221813

Change-Id: I5c03a2cde466a87b6f8067838b411319ba907fb2