Sound Settings: Catch up to CM

Fill this in later... do not merge to main branch until tested on a phone