[1/2] Base: Clock on lockscreen
Allow to enable status bar clock on lockscreen (default off)

Change-Id: I80014df8544b149dbf6fb5b846d922f4ed09427e

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java