Merge "DO NOT MERGE Fix missing "manage conference" option." into m-wireless-dev

    <include layout="@layout/manage_conference_call_button"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/photo" />

        android:layout_below="@id/primary_call_info_container" />

    <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. -->

    <FrameLayout