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

Change-Id: I99a8402941dd295c73aca0cfd88067b615eeaec4