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

Change-Id: I933b8597b682a72ee3db82ad08b7f930f813f7fa