[automerger skipped] Merge "Delete BubbleTouchHandler in favor of more traditional touch handling." into rvc-dev am: 8fc6e456 am: 891cd555 am: e72a926d am: 146f1907 -s ours am: 429f11ba -s ours

am skip reason: Change-Id I46001c24f4de58c3d70b7629a22b930fa791b77a with SHA-1 7dd88b02 is in history

Change-Id: Ib9cce09ccca9823c05d3bc12fe9210044b3fd98d