[Android][WebSignin] Adjust bottom sheet subtitle line height

This CL adjusts the bottom sheet subtitle line height to make it look
consistent with the incognito interstitial message style, which is
required by UX.

Bug: 1132215
Change-Id: I786e4ce1d86cabc26bbb026a5a666d5caefc6593
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2429404Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810739}

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

@@ -37,7 +37,7 @@
         android:textAppearance="@style/TextAppearance.TextLarge.Primary"
         android:text="@string/signin_account_picker_dialog_title" />
 
-    <org.chromium.ui.widget.TextViewWithLeading
+    <TextView
         android:id="@+id/account_picker_bottom_sheet_subtitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -46,8 +46,7 @@
         android:layout_marginBottom="16dp"
         android:gravity="center_horizontal"
         android:textAppearance="@style/TextAppearance.TextMedium.Secondary"
-        android:text="@string/signin_account_picker_bottom_sheet_subtitle"
-        app:leading="@dimen/text_size_medium_leading" />
+        android:text="@string/signin_account_picker_bottom_sheet_subtitle" />
 
     <View
         android:id="@+id/account_picker_horizontal_divider"

chrome/android/java/src/org/chromium/chrome/browser/signin/account_picker/AccountPickerBottomSheetView.java

@@ -19,7 +19,6 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.signin.DisplayableProfileData;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
 import org.chromium.ui.widget.ButtonCompat;
-import org.chromium.ui.widget.TextViewWithLeading;
 
 /**
  * This class is the AccountPickerBottomsheet view for the web sign-in flow.
@@ -45,7 +44,7 @@ class AccountPickerBottomSheetView implements BottomSheetContent {
     private final View mContentView;
     private final ImageView mLogoImage;
     private final TextView mAccountPickerTitle;
-    private final TextViewWithLeading mAccountPickerSubtitle;
+    private final TextView mAccountPickerSubtitle;
     private final View mHorizontalDivider;
     private final RecyclerView mAccountListView;
     private final View mSelectedAccountView;