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

Change-Id: I41dec3cb31e6b523927717950f827f45dadabd8b