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

Change-Id: Ib6d0ed75d7ac5b7ae5c6785082710359e1b23f09