Merge "Update notification settings to match Notification Dot branding." into oc-dev am: ed8b39fe60
am: a974b8c595

Change-Id: Ie61557590cdc15e2d03b1e71bbc78def2c60046a