Merge "[PANDORA_TEST] Update a2dp method to use a device" am: 2e259314 am:...

Merge "[PANDORA_TEST] Update a2dp method to use a device" am: 2e259314 am: 448fc7ed am: 6e9947e6

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2163710



Change-Id: I6a36074cd3ab3750bcced7d1b6fb5743900e72c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>