[automerger skipped] Merge "Merge "Delete BubbleTouchHandler in favor of more traditional touch handling." into rvc-dev am: 8fc6e456 am: bcfd8a36" into rvc-d1-dev-plus-aosp am: 584266e7 -s ours am: 3f55851d -s ours

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

Change-Id: Icdc1a68008941310e227fe1f22ae6ac7b0f75747