Merge "Some Autofill API changes." into oc-dev am: fe1bddfbb5
am: a4d2749cf8

Change-Id: I460229f5bf0c4fc832256e00746a813fd08991ea