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
am: a3132030
Change-Id: Iddccb28517f193179c771b2e699b6c54769ce06f