Forward port AM/PM Style Settings

Change-Id: I1de2f7a1ec0deeecc9c9dfff3a6840f6523c12b0

Conflicts:
	res/values/cm_arrays.xml