Merge "Fix volume control failed when switching active a2dp device"
am: dbbab9a07e

Change-Id: I6c2c52ac0505471c498dabc7e70ad81a0e758e4b