Merge "Add resource color test" into lollipop-mr1-cts-dev
am: 5a7900c8b1

Change-Id: I2cee1ee7bf44e223acdb4d8c1c513d07e1ab74ea