Re-add lockscreen music controls toggle.

Change-Id: I70fb6c0d20caad7af01a45b4a9374eb107a554a3
Merge "Re-add lockscreen music controls toggle." into cm-10.2
Merge remote-tracking branch 'remotes/cm-10.2/cm-10.2' into cm-10.2