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

Change-Id: I91115965ffa92d4ce789ded1d9b329f0ec66d97b