Merge "Cherry-picked some Autofill Javadoc improvements from master." into oc-dev am: 6829a1dace am: e971d933be
am: 35120d33fe  -s ours

Change-Id: I3a921cd3ad150516480c181e305edeb0747ac922