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

Change-Id: I91ad2b1a0769aa6ce1ae0900879cac3084f761f2