Merge "Consolidating MODIFY_AUDIO_SETTING permission checks" into sc-dev