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: b70e07aa am: ea415a76

Change-Id: I7ad52a0232939993131fdf2c3d59acb069ee838b