Merge "Fixing Layout height for Private Space container" into main

    <TextView

        android:id="@+id/ps_container_header"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/ps_header_text_height"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/ps_header_text_height"

        android:layout_alignParentStart="true"

        android:layout_centerVertical="true"

        android:layout_toStartOf="@+id/settingsAndLockGroup"