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 am: 094da7d8 am: a590fc89

Change-Id: I50968e87241671208a10ef05df7ca5dec9f81900