Merge remote-tracking branch 'github/cm-11.0' into cm11mod
Disable Touch by Proximity Sensor

Support Sweep2Wake/DoubleTap2wake/Knock2Wake features in custom
kernels which prevent touch from sleeping when screen is off.

Change-Id: Ic5bdaf63ffe7502ad164b6e3022ffe8393011e1e
InCallUI: IT translations

Change-Id: I0d8cace1ec7f582c83357f2d2a5c20d98f725a0d