[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
am: 90a99332e7
am: c752d03daf
am: 9de88efcb9
-s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 fc8115d91b
is in history
Change-Id: I39d5690e71ccb5013c53c63db54be86daafae754
This commit is contained in: