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

Change-Id: I87184cee7b1c1b3cfe8840734b4c71dff6719352