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