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

Change-Id: I8053d6554fcc5090746054e592cd6a5c96a26d83