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

Change-Id: I6f618fc7b4dc5065c810e5d940f4bdc9b16675c0