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

Change-Id: Ie8a4a655770cb0175d335cf74cbb73b65a60e19d