Merge "AudioService: do not persist mic mute and master mute" into nyc-dev