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

Change-Id: I4e65c04b63813ef95ec8bb99e783dfe223ca7a5a