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: 4fc9764b am: 6bed6172 am: b3fe7dcb

Change-Id: Iaf36dd71c048a1e93702f8bf47db287cf5d8ddfd