Merge "Move USE_COLORIZED_NOTIFICATIONS to com.android. am: 708a1ca16a  -s ours" into oc-mr1-dev