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

Change-Id: Iac1cc5205d90e2cce2206585bcfba93ed737a58a