Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/values/cm_strings.xml

Change-Id: I155f3facadd74ae7c8407bcef59e242ded175560
User defined Autoderptate 1/2

PS2: I prefered the Xbox. Added a missing semi-colon
PS3: Added some missing imports
PS4: Maybe at E3 this year? Good to go. Moved the rotation settings up one slot--was below Wallpaper, now above wallpaper settings.
PS5: Add missing updateSummary function (NUKE)

Change-Id: If73cd8d511d6734ab0abe9c4346a8d6fcd183bab