Merge "Merge "DO NOT MERGE: Add TouchLatency test" into cw-f-dev am: 647166e8 am: e9d31e0b" into nyc-mr2-dev-plus-aosp