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

Change-Id: I7606364318202ad60b416438f500aaaff8eec0fb