HighTouchSensitiviy: update for new api

Change-Id: I936b0cc6e7be40bfa4f9db29bd1056b46c4bb268
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	cmhw/org/mokee/hardware/HighTouchSensitivity.java

Change-Id: Iedb87bd054ec271dc97e4a9742ce48251a38a983