Merge "Set the correct default in quick_qs_status_icons" into sc-dev

    <com.android.systemui.statusbar.policy.Clock

        android:id="@+id/clock"

        android:layout_width="0dp"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:minWidth="48dp"

        android:minHeight="48dp"

    <LinearLayout

        android:id="@+id/rightLayout"

        android:layout_width="0dp"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:gravity="center_vertical|end"

        >

        <com.android.systemui.statusbar.phone.StatusIconContainer

            android:id="@+id/statusIcons"