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

Change-Id: I44079cc5dec0f7c513370ae9effdcd93180da38c