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

Change-Id: Ibf4d13e4fb4538ed9cfbae489a47057f3e78d644