Merge "Fix volume control failed when switching active a2dp device" into qt-dev
am: 535397d4a3

Change-Id: I0adfba6417e0f5ec3e89b62234d49aea35442e52