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

Change-Id: Ifa89665d6913980ab95147423a7a63a97e89d392