Merge "Merge "Fix ViewTest.testOnTouchEvent for Wear" into pie-cts-dev am: 9ae6f969b2"