Merge "audioflinger: Fix battery accounting for offload tracks" into nyc-mr1-dev am: beec2335c7
am: 49f56aeecd

Change-Id: If456cd84ba0505187f16abe4eb285d902e5b9777