Merge "Pass in active device to all BluetoothA2dp APIs in packages/apps/Settings as null input is no longer supported"