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

Change-Id: I432e5f3229af63826c1c2921ce29899bc80915ab