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