Revert of ❄ Split off RadioButtonLayout from InfoBarControls

chrome/android/java/res/layout/promo_dialog_layout.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2017 The Chromium Authors. All rights reserved.
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
 <!-- This XML should not be inflated by anything except PromoDialog.java.
 
      This layout is deeply nested to account for the various bits having to flop orientations
      in landscape.  If these become more frequently used, we should investigate optimizing the
      layout.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:chrome="http://schemas.android.com/apk/res-auto" >
 
     <org.chromium.chrome.browser.widget.PromoDialogLayout
             android:id="@+id/promo_dialog_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:orientation="vertical"
             android:background="@drawable/menu_bg"
             chrome:maxWidth="@dimen/promo_dialog_max_width" >
 
         <org.chromium.chrome.browser.widget.FadingEdgeScrollView
                 android:id="@+id/promo_container"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:fadeScrollbars="false" >
 
             <!-- This layout pivots when the dialog is wider than it is tall. -->
             <LinearLayout
                     android:id="@+id/full_promo_content"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="@dimen/promo_dialog_padding"
@@ skipping 37 matching lines @@
                 </org.chromium.chrome.browser.widget.BoundedLinearLayout>
             </LinearLayout>
 
         </org.chromium.chrome.browser.widget.FadingEdgeScrollView>
 
         <ViewStub
                 android:id="@+id/footer_stub"
                 android:layout="@layout/infobar_control_description"
                 android:inflatedId="@+id/footer"
                 android:layout_margin="@dimen/promo_dialog_padding"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
         <org.chromium.chrome.browser.widget.DualControlLayout
                 android:id="@+id/button_bar"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:padding="@dimen/promo_dialog_padding"
                 chrome:buttonAlignment="end"
                 chrome:stackedMargin="@dimen/infobar_padding" />
 
     </org.chromium.chrome.browser.widget.PromoDialogLayout>
 
 </merge>