Merge "Fix vertical alignment of notification contents."

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_gravity="fill_vertical"

        android:layout_marginLeft="@dimen/notification_large_icon_width"

        android:minHeight="@dimen/notification_large_icon_height"

        android:orientation="vertical"

        android:paddingRight="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp"

        android:gravity="center_vertical"

        >

        <LinearLayout

            android:id="@+id/line1"