MSimNetworkController: disable log spew

Some logging statements are not properly guarded leading to logcat
flood every few seconds.

Change-Id: I2a34b21d23891a3506f7024c464eb2ddf273e715
CM11 Themes: Allow defining a custom default theme [1/3]

Conflicts:
	core/java/android/content/pm/ThemeUtils.java
	core/java/android/provider/ThemesContract.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	services/java/com/android/server/ThemeService.java

Change-Id: I6b794d6c9c27b2d6436bdf4fec51c84a7859c134
Merge remote-tracking branch 'carbon/kk' into kk