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

This reverts commit 1a508686d1559a573b29e3942d3148b3f338d4f1.

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