Always adds margin at the end of the label to handle case where label

ui/android/java/src/org/chromium/ui/DropdownAdapter.java

 // Copyright 2014 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.
 
 package org.chromium.ui;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
@@ skipping 172 matching lines @@
         labelView.setTextColor(ApiCompatibilityUtils.getColor(
                 mContext.getResources(), item.getLabelFontColorResId()));
         labelView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                 mContext.getResources().getDimension(item.getLabelFontSizeResId()));
 
         TextView sublabelView = (TextView) layout.findViewById(R.id.dropdown_sublabel);
         CharSequence sublabel = item.getSublabel();
         if (TextUtils.isEmpty(sublabel)) {
             sublabelView.setVisibility(View.GONE);
         } else {
-            sublabelView.setLayoutParams(layoutParams);
+            if (item.isLabelAndSublabelOnSameLine()) {
+                // Use the layout params in |dropdown_item.xml| for the sublabel if it is on the
+                // same line as the label. We regenerate the layout params in case the view is
+                // reused and the label and sublabel are on the same line when the view is reused.
+                LinearLayout.LayoutParams subLabelLayoutParams = new LinearLayout.LayoutParams(
+                        LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+                ApiCompatibilityUtils.setMarginStart(subLabelLayoutParams, mLabelHorizontalMargin);
+                ApiCompatibilityUtils.setMarginEnd(subLabelLayoutParams, mLabelHorizontalMargin);
+                sublabelView.setLayoutParams(subLabelLayoutParams);
+            } else {
+                sublabelView.setLayoutParams(layoutParams);
+            }
             sublabelView.setText(sublabel);
             sublabelView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                     mContext.getResources().getDimension(item.getSublabelFontSizeResId()));
             sublabelView.setVisibility(View.VISIBLE);
         }
 
         ImageView iconViewStart = (ImageView) layout.findViewById(R.id.start_dropdown_icon);
         ImageView iconViewEnd = (ImageView) layout.findViewById(R.id.end_dropdown_icon);
         if (item.isIconAtStart()) {
             iconViewEnd.setVisibility(View.GONE);
@@ skipping 30 matching lines @@
         return mAreAllItemsEnabled;
     }
 
     @Override
     public boolean isEnabled(int position) {
         if (position < 0 || position >= getCount()) return false;
         DropdownItem item = getItem(position);
         return item.isEnabled() && !item.isGroupHeader();
     }
 }