[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 skip reason: change_id Idc7a701c754edfe87ba72bb83d6b3809572eaaa5 with SHA1 a004c787 is in history
Change-Id: I1098f73aff0cf9a256910a446a223172c8439282