Merge "DO NOT MERGE - Backported some Autofill Javadoc improvements from master." into oc-mr1-dev
am: 11238d4f36

Change-Id: I38a6305bae7769aacaa3894744fc73dc82c25a62