Active display: Add options for date and am/pm [2/2]

Change-Id: I6af47b2fd47e77398eee98cc6e30b8fcf1a44d45

Conflicts:
	res/values/strings.xml
	res/xml/active_display_settings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java
Active display: Add sunlight mode. [2/2]

Change-Id: I513c2ef1555ca48dfb553f80ca687d1ca9f27c55

Conflicts:
	res/values/strings.xml