Reland "[Feed V2] Update margins to render the external surface cards correctly."

This reverts commit ac85bf58.

Reason for revert: We are going back to client-side change for margins, since server-side margin fix does not get the full UX we need.

Original change's description:
> Revert "[Feed V2] Update margins to render the external surface cards correctly."
> 
> This reverts commit d6d62019.
> 
> Reason for revert: We want to keep control over the margins from the Chrome side.
> 
> Original change's description:
> > [Feed V2] Update margins to render the external surface cards correctly.
> > 
> > Bug: 1106425, b/161142289
> > Change-Id: If3c89644289b6eb1d5b61f6680f03bf95e3b6888
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2303172
> > Reviewed-by: David Trainor <dtrainor@chromium.org>
> > Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
> > Commit-Queue: Justin DeWitt <dewittj@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#789547}
> 
> TBR=dewittj@chromium.org,dtrainor@chromium.org,carlosk@chromium.org
> 
> # Not skipping CQ checks because original CL landed > 1 day ago.
> 
> Bug: 1106425
> Bug: b/161142289
> Change-Id: I5b01fbb8167caaa027a9d7423c1272d66c35a56b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2347220
> Reviewed-by: Cathy Li <chili@chromium.org>
> Reviewed-by: David Trainor <dtrainor@chromium.org>
> Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
> Commit-Queue: Cathy Li <chili@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#797373}

TBR=dewittj@chromium.org,dtrainor@chromium.org,carlosk@chromium.org,chili@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1106425
Bug: b/161142289
Change-Id: If95f91faa9511f8eb83f73680d92814422433377
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363005Reviewed-by: Cathy Li <chili@chromium.org>
Reviewed-by: Carlos Knippschild <carlosk@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Cathy Li <chili@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800037}

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceCoordinator.java

@@ -230,9 +230,12 @@ public class FeedSurfaceCoordinator implements FeedSurfaceProvider {
         mActionOptions = actionOptions;
 
         Resources resources = mActivity.getResources();
-        mDefaultMargin =
-                resources.getDimensionPixelSize(R.dimen.content_suggestions_card_modern_margin);
-        mWideMargin = resources.getDimensionPixelSize(R.dimen.ntp_wide_card_lateral_margins);
+        mDefaultMargin = resources.getDimensionPixelSize(mV2Enabled
+                        ? R.dimen.content_suggestions_card_modern_margin_v2
+                        : R.dimen.content_suggestions_card_modern_margin);
+        mWideMargin = resources.getDimensionPixelSize(mV2Enabled
+                        ? R.dimen.ntp_wide_card_lateral_margins_v2
+                        : R.dimen.ntp_wide_card_lateral_margins);
 
         mRootView = new RootView(mActivity);
         mRootView.setPadding(0, resources.getDimensionPixelOffset(R.dimen.tab_strip_height), 0, 0);

chrome/android/java/res/values/dimens.xml

@@ -354,9 +354,11 @@
          (matches toolbar_height_no_shadow). -->
     <dimen name="ntp_search_box_bounds_vertical_inset_modern">-4dp</dimen>
     <dimen name="ntp_wide_card_lateral_margins">48dp</dimen>
+    <dimen name="ntp_wide_card_lateral_margins_v2">36dp</dimen>
     <dimen name="snippets_article_header_height">40dp</dimen>
-    <!-- This is in sp because we want the icon to scale with the TextView it sits alongside. -->
     <dimen name="content_suggestions_card_modern_margin">12dp</dimen>
+    <dimen name="content_suggestions_card_modern_margin_v2">0dp</dimen>
+    <!-- This is in sp because we want the icon to scale with the TextView it sits alongside. -->
     <dimen name="md_incognito_ntp_line_spacing">6sp</dimen>
     <dimen name="md_incognito_ntp_padding_left">16dp</dimen>
     <dimen name="cryptid_height_in_logo_wrapper">60dp</dimen>