Automatic translation import

Change-Id: Iad18df94758aaf13ebdf67efef70f1645db9e4b9
AdvancedDisplay: Update to 4.4 settings style

Change-Id: If2c0f8b1c42d3a09c8d795b0b17f7ff2325c56b8
Automatic translation import

Change-Id: Ib2eb58c3cea8105dbfd931ef7e85cbeb96973f1c
Merge "AdvancedDisplay: Update to 4.4 settings style" into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0