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