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

Change-Id: Ia8931bffb2a19993b598fcf6ecf9f09ab5157614