Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e760408" into oc-dev-plus-aosp
am: c3f93e120c

Change-Id: Iaaf0f43a5d395110633c261e2f73025a284821b7