Merge "Don't show AUTOFILL menu when text is selected." into oc-dev am: 49231f183f
am: fc4604f719

Change-Id: I73c6181f7fdd4b2b4c38338c13d9bf439199617f