Merge "Merge "Fixed updateAutofillValue() when mText is not set." into oc-dev am: 4eaba84065 am: 51ed7f4e6b" into oc-dr1-dev-plus-aosp