Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
am: 7990306b8b

Change-Id: Id8d4957a142440c5e9b28bb2009f8299d8d3edf8