Merge "AudioService: fix step rescaling." am: 7516db2ec2
am: 87daf33b20

Change-Id: I3033693a4914bd8015d3065d5d6c588fb8789592