Merge "Merge "Merge "Clarified that getAutofillValue() must return same value passed to autofill()." into oc-dev am: 7d29b6f2df am: da31220015" into oc-mr1-dev am: 4aefa37d9e" into oc-mr1-dev-plus-aosp
am: 7743c44fac

Change-Id: I46dc4aecedd5b19ba5e741c4c8a3daaa7d3c080d