Merge "Add batch volume adjust support to adjustMasterVolume() in AudioManager and AudioService." into ics-aah