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

This reverts commit 80fe5daf8345fc2135762ef693c0ac087fcfb77e.

Conflicts:
	res/values/strings.xml
	src/com/android/settings/beanstalk/ActiveDisplaySettings.java