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