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

Change-Id: I7119365fe42c09ed4bdc73a6316c349568f8703c