Merge "Modify the y-coordinate of touch events in testTouchEvent" into lollipop-cts-dev
am: 3305a6503e

* commit '3305a6503e4fc39f60b9a538ac2da804efcb28c5':
  Modify the y-coordinate of touch events in testTouchEvent