[automerger skipped] Merge "Fix volume control failed when switching active...
[automerger skipped] Merge "Fix volume control failed when switching active a2dp device" into qt-dev am: 16bc4e20 -s ours
am: ab524b35 -s ours
am skip reason: change_id Idc7a701c754edfe87ba72bb83d6b3809572eaaa5 with SHA1 3fbd16d4 is in history
Change-Id: I8690c3b2d87f53557b66850b7285f7f4147f638e