Merge "Notification settings, importance and pre-O apps" into oc-dev am: 6393e1752f
am: 237eb88434

Change-Id: Ie8c6262c35b79259974ffe069b37b2e6d2507b50