Merge "Merge "Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff6 am: 2de4d6bc" into oc-dr1-dev-plus-aosp am: 28157d45"