Double-Berry Shortcakes