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/chameleonos/ActiveDisplaySettings.java