Merge "Allow setup apps to colorize notifications." into oc-dr1-dev am: e4101089bb
am: 6b734d0478  -s ours

Change-Id: I2e16c19fc248457d3d9a54063e6d897db7dc02c3