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

Change-Id: I95ec6a9141b270d15ae3ff240ddcd0122b1d103d