Settings: move CM additions out of AOSP files