DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 579e3667e3
am: 24b0b5ca68  -s ours

Change-Id: I6a489a035d2242e42504941b82718611cf87e022