Merge \\"AudioFlinger: fix offload volume on resume\\" into nyc-mr1-dev am: cecb30a22f
am: 97a480927d

Change-Id: I00f8643d420ab63ce63658aebb98794c7517958c