cm: Reenable SettingsProvider overlay

Change-Id: I72acd06e06d745b71f1761637b1de00f2a15a9ef