Fix ExtendedEditText not handling touch correctly b/31555902
am: 3f9d647de6

Change-Id: I8222f4f386f3322d167bce070070bf473685d789