Merge "Set EditText height to wrap content in EditUserInfoDialog" into main

    <EditText

        android:id="@+id/user_name"

        android:layout_width="match_parent"

        android:layout_height="@dimen/user_name_height_in_user_info_dialog"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:minWidth="200dp"

        android:layout_marginStart="6dp"

    <dimen name="add_a_photo_circled_padding">6dp</dimen>

    <dimen name="user_photo_size_in_user_info_dialog">112dp</dimen>

    <dimen name="add_a_photo_icon_size_in_user_info_dialog">32dp</dimen>

    <dimen name="user_name_height_in_user_info_dialog">48sp</dimen>

    <!-- Minimum increment between density scales. -->

    <fraction name="display_density_min_scale_interval">9%</fraction>