Re-add lockscreen music controls setting.

Change-Id: If137978d5c0fa197e75707fd6fe7b09c850de454

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java