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

Change-Id: I683b81238d8e6e25034f55bc0a126810e0057621