Merge "Expanding the list view to be scrollable on watch." into nougat-mr1-cts-dev am: a4f3582377 am: 5007a93fe7
am: 9590c33f06

Change-Id: If5dcd8770aff849314040d368d711c693556fa54