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

Change-Id: I00eed7ae9679f117296ad1f7162e057720e69aab