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
Settings: Second Clock (2/2)

https://github.com/Dokdo-Project/platform_packages_apps_Settings/commit/ae92418a3e50fdae6891053492d155fc7e010e5f#diff-ad1634d6f24fb13c45a1137e95c26371R287

PS2: Fu Whitespace

Change-Id: Ie5ad1c877d86a5048dda6f14cf9ccef2d2819acb

Conflicts:
	res/values/pac_strings.xml
Fixes
Fix error in build caused by Keyguard: Switchable LockScreen Media Controller Screen
Move unlock icons for Gmail and Snapchat from dcm_arrays to cm_arrays