wifi: Fix configuration of country code for wifi
Revert Contextual header and Status bar clock color options

Conflicts:

	res/values/mahdi_strings.xml
	src/com/android/settings/mahdi/StatusBarClockStyle.java
Revert "Settings: Second Clock (2/2)"

This reverts commit 2be9dea0dc2aa9eab209dd3d9d83d8bb72aa1cff.

Conflicts:
	src/com/android/settings/mahdi/StatusBarClockStyle.java

Conflicts:

	src/com/android/settings/mahdi/StatusBarClockStyle.java