Merge "Make ColorUtils public in support-v4" into lmp-mr1-ub-dev