Merge "DO NOT MERGE: Add TouchLatency test am: 91e2e7f460 am: 8360e7e38a" into nyc-mr2-dev-plus-aosp