Merge "audiomanager: fix volume group callback" am: bb10358ac2 am: 33e7011c7f

Change-Id: I1cf2be15ed42f5c256005182a641aef254edce4b