Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev
am: 215ebb941d

Change-Id: I4adf0b0ed352f7f20f93c5fe1bbebea84b4b9bda