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

Change-Id: I4d27ebef1d24c0efefebfbd04597088bed740456