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

Change-Id: Id05a08413742ef94a426738fd0e82243c0553942