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