Merge "Make RingtoneManager and Ringtone class support VolumeShaper"