Merge "Add watch specific dimens for listrow_height and listviewfixed_layout" into oreo-cts-dev am: 67dbffe048 am: e1f5b2af20 am: f039cb96e2
am: 68653c3271

Change-Id: I2a08b1214b99bb3bc43fe78a84a04f160957c1f4