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

Change-Id: I27bf69e6f175c2721a5943ae48e598223d122e47