[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0
am: e18b79d22d
-s ours am: 9bbd35b576
-s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11
is in history
Change-Id: I1f8a784778d0130c683d9d759cee3cf266b8ae08
This commit is contained in: