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

Change-Id: I91a176d1602ecda066f08c22829940f9229a48ae