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

Change-Id: Idc09772829cc6aa9bcfb064459fb3557c7b37f6b

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/donottranslate.xml