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