Merge "Merge "Fix ViewTest.testOnTouchEvent for Wear" into oreo-mr1-cts-dev am: c55b42f8e2" into pie-cts-dev