Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am: 7d29b6f2 am: da312200" into oc-mr1-dev