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 am: 27c99b1f

Change-Id: Ie49e204b56a49dd622637b6f97a7590f1a508cb1