Frameworks: statusbar clock and expanded notification clock color options (1/2)

Conflicts:

	core/java/android/provider/Settings.java
lilfucker snuck by me