Merge "Merge "Revert "Trim text from autofillvalue when checking for empty."" into oc-dev am: 215ebb941d am: 730924cd65" into oc-dr1-dev-plus-aosp