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

Change-Id: I21fd7744c901305ad8ea888f3941464833757318