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
am: fee57ca5
Change-Id: I607e8a9ae5998300f101558b0e49dc7563bc3957