Show Seconds next to StatusBar Clock [1/2]

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I946753f42039b8651e9cac30def17b6c23ca4462
Merge "Show Seconds next to StatusBar Clock [1/2]" into kk