Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: a49aa940be
am: c2bdd4418d  -s ours

Change-Id: Ied37728f9cb3d72d1e6b045f8648143652bf3ffa