[automerger skipped] Merge "Delete BubbleTouchHandler in favor of more traditional touch handling." into rvc-dev am: 8fc6e456 am: 891cd555 am: 8413f7de am: f7cbe485 -s ours

am skip reason: Change-Id I46001c24f4de58c3d70b7629a22b930fa791b77a with SHA-1 955278e4 is in history

Change-Id: Idff41b794f18ecb2dc23b17fa875144e7ab072cc