Automatic translation import

Change-Id: Id47e0dcee33861c2c40110b924057b257050e0dd
Settings : Add preference for proximity wake

Change-Id: I2fcbdee3bcf33f8e44b6c5fa29fb1d4d6dcab8e4
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0