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

Change-Id: I6de602f69d43e635f6925a9eeac78d06b8d03592