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

Change-Id: I9d2cb856c3248f735fab6922ea6607a7fa925d0e