Merge "Move settingslib overlays to framework-res." into oc-dev