Merge "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"