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: aeb5eb40
* commit 'aeb5eb40':
Change-Id: I024e63bf53735a047dac857d92e6df1f476ad0a4