Merge "Keep ToggleLockscreenTiles in sync between Quick Settings and Ribbon" into cm-10.2
Conflicts:
	packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java

Change-Id: I100ea8b55d4688c104f3e9b00c63748e59e8f947