Merge "Introduce MODIFY_AUDIO_SYSTEM_SETTINGS permission"