Merge "Merge "Fix ViewTest.testOnTouchEvent for Wear" into pie-cts-dev am: 9ae6f969b2"
am: 1cc03e5386

Change-Id: Ibb64432c9e661d59a16fe867c94da4403c83d14b