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

Change-Id: Ic75b2ebc577bf950ad8c57e4535dfb00f895c0c0