Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e852 am: e9d31e0b46" into nyc-mr2-dev-plus-aosp
am: 05fa2d6a2e  -s ours

Change-Id: Id98a24298d1a5fc9e82f8d0a4026957535310249