Merge "Revert "Consolidating MODIFY_AUDIO_SETTINGS permission checks"" into rvc-dev