cm: Reenable SettingsProvider overlay

Change-Id: I72acd06e06d745b71f1761637b1de00f2a15a9ef
(cherry picked from commit bc513cf92713865e0619d164c3a52e16f4798e1d)