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

Change-Id: I0396ec25d6355d094aebbf57c589befba71e0d58

Conflicts:
	core/java/android/provider/Settings.java
Frameworks/base: Second Clock (1/2)

https://github.com/Dokdo-Project/platform_frameworks_base/commit/6ab5d6299295246c34a46ffd3f5fe83cdc191cd0#diff-1fa71c270d063a48f921f0760d10c7f3R122

PS2: Fu Whitespace
PS3: small Issue

Change-Id: Ie04942ae1bb1649d18db51086b46666b56ef1ea0