Merge "AudioFlinger: fix offload volume on resume" into nyc-mr1-dev