Merge "Displays background complication provider icon in preview when...
Merge "Displays background complication provider icon in preview when background complication is active, and optimizes UI for 6 watch sizes." into nyc-mr1-dev am: ce2cc82c
am: aa67cac2
Change-Id: I47a4bbcd31e09ba45078c24516dfb6a9e1323d9e