remove stuff from merge

Change-Id: I35a8b23c960afc61697e59ed70bd53dc1d8848ad
SettingsProvider: Handle migration from cm-11.0

Change-Id: Ifa52b4518c17e7653206135fcb435d9dc5ab0e8f
Factor out preference-in-storage check to overridable method.

Change-Id: I2fff3192802f8a180330fda66388eda394334a5a