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

Change-Id: I4734f1b5abbdf907692006355c2a60d13549819b