DataUsageSummary: fix mobile data usage display for GSM devices with no number

Some providers don't write phone number onto SIM card causing the
phone number check introduced in the partially reverted commit to fail.
Re-introduce the original check with the "or" condition.

This partially reverts commit 4c51b45355b9d6fed973f946738bf455a8b7c9ea.

Change-Id: I69a65a1a421dcdf168c3d0afeb7110cb97790034
Settings: move CM additions out of AOSP files

Patch set 5:     - don't forget about Wi-Fi region code arrays...
                 - seperate strings and arrays
Patch set 6/7/8: - rebase

Change-Id: I0344183c1d7587de7b0a2321e364159ee356dbae
Fix: Don't display the lock clock preference if its not installed

Removed duplicated codes

Change-Id: Ib7d54dfc33c6a66711799bbdf44212d287221ae9
Merge "DataUsageSummary: fix mobile data usage display for GSM devices with no number" into cm-10.1
Merge "Fix: Don't display the lock clock preference if its not installed" into cm-10.1
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java

Change-Id: Ia923770622130f7af68f5ca2b45fee3506bca2ae