cm: Reenable SettingsProvider overlay

Change-Id: I72acd06e06d745b71f1761637b1de00f2a15a9ef

Conflicts:
	overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
Merge branch 'ose-4.4' of https://github.com/OSE44/android_vendor_cm into ose-4.4