Keyguard: Switchable LockScreen Media Controller Screen [2/2]

Change-Id: I252d2fc2dbec73d275760bb30725a841126b29d7

Conflicts:
	res/values-ko/dokdo_strings.xml
	res/values/dokdo_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/slim/LockscreenInterface.java
Fix for last commit