Merge "Fix ExtendedEditText not handling touch correctly b/31555902" into ub-launcher3-calgary-polish
am: 13c14c8f8c

Change-Id: I6dfc939480c54909e34e5ae6747bd22e86fa5368