Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c
am: 2de4d6bce4

Change-Id: I8eb50d5191b2393011c297671bd5d3c65e1beb7e