Merge "Merge "Adjust touch position for handles using window coordinate." into...
Merge "Merge "Adjust touch position for handles using window coordinate." into nyc-dev am: f2f8e65f am: 387838ea" into nyc-mr1-dev-plus-aosp
am: 74174239
* commit '74174239':
Change-Id: Iaf7d5dacd86a1bfda63a5687b9256d344309e532