am cf8433a8: am ca496ada: Merge "Fix CTS testTouchEvent for watches." into lmp-sprout-dev

* commit 'cf8433a89fdae4d878afa945154f4a8298c052c4':