Add option to hide music controls in lockscreen.

JIRA:CYAN-1566
Change-Id: Iae3dd9914b1685c6bf1e39e421372ce0bdfb93cc

Conflicts:

	core/java/android/provider/Settings.java