Merge "Fix incorrect logic to now use a passed in BluetoothDevice when it's...

Merge "Fix incorrect logic to now use a passed in BluetoothDevice when it's not null, not when it's null in A2dpProfile.java" into rvc-dev am: ef226702 am: 3c12238b

Change-Id: Ic8654399fc21a11d711d29a4f5aaac4f5d1768a4