[automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev am: 54edae5e54
am: fbbda91c9e
-s ours am: 90d73cdcd7
-s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11
is in history
Change-Id: Ic523789d07f166727d8c99b6da6f5e393e152aba
This commit is contained in: