Merge pull request #452 from android/jakew/color-utils/2018-03-21

Add TODO to replace Color.plus(Color) with ColorUtils.
tree: 6ec05f11c6a1d999b22edda90270dcd4b24b5b7e
  1. core/