Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am: 211e7604 am: d11e14b4" into oc-dr1-dev-plus-aosp