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

Change-Id: I682065cd5fcfb2de9639874705fefdeaed06d343