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

Change-Id: I329e19a1c8f15df6fb089dd7a9517d2015522281