Merge "Add dismiss button to new conversation guts" into main

            android:layout_marginTop="@*android:dimen/notification_2025_margin"

            android:minHeight="@dimen/notification_2025_guts_button_size"

            >

            <TextView

                android:id="@+id/inline_dismiss"

                android:text="@string/notification_inline_dismiss"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentStart="true"

                android:gravity="center_vertical"

                android:minWidth="@dimen/notification_importance_toggle_size"

                android:minHeight="@dimen/notification_importance_toggle_size"

                style="@style/TextAppearance.NotificationInfo.Button"/>

            <TextView

                android:id="@+id/done"

                android:text="@string/inline_ok_button"