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

Change-Id: I89a097391c70d694f902a518bd6b42fbd10ebd5d