Merge "Remove MODIFY_TOUCH_MODE_STATE from SystemApi" into tm-dev