cm: Reenable SettingsProvider overlay

Change-Id: I72acd06e06d745b71f1761637b1de00f2a15a9ef
cm: Pastefail

Change-Id: I51bae450b09a324231f9520b1623334c4202e869
Merge remote-tracking branch 'cm/cm-11.0' into wszf