Merge "Adds color icon to the small image data provider for complication test...
Merge "Adds color icon to the small image data provider for complication test suite." into nyc-mr1-dev am: a778ba03
am: e6e9f42b
Change-Id: I52dc2406be9d56dc74af6cb01b79e5a1b1a54171