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

Change-Id: I058b5fd135e4165214116055ccdc04e9d99955b0