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

Change-Id: I193c2e23f5be6cb2e837a3043d881e294b5e2e48