Merge "AudioService: persist volume of ring stream when ringer mode changed"