Merge "Change layout_height of contentPanel in Wear AlertDialog to wrap_content" into cw-f-dev

            <!-- Content Panel -->

            <FrameLayout android:id="@+id/contentPanel"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:layout_height="wrap_content"

                    android:clipToPadding="false">

                <TextView android:id="@+id/message"

                        android:layout_width="match_parent"