Merge "Merge "Restore cursor in watch extract text view" into nyc-mr1-dev am:...
Merge "Merge "Restore cursor in watch extract text view" into nyc-mr1-dev am: cdb1ff37" into nyc-mr1-dev-plus-aosp
am: d33d6bd4
* commit 'd33d6bd4':
Restore cursor in watch extract text view
Change-Id: I8e25c62246745501b528960ef710d3eb0b3046e5